Various fixes suggested by RubyMine. (style for the most part).
Fixes suggested by RubyMine.  (style for the most part.)
Fix a geninue potential issue, a non-quoted string.
Simplify a few things.