Attempts to get this running under newer Ruby.
Tidy up whitespace...