Additional style refactoring - still not quite done.