Implemented review comments from @jralls.