Changes based on Oleg's recommendations from last night

Changes based on Oleg's recommendations from last night.  Need to test before
making/reasserting pull request.