Minor refactoring to multiple lines to assist in debugging issue #2.