* Fix companion object names not being resolved This slipped through the cracks before the release Fixes #546 * Add braces on the else clause for symmetry