Cleanup

@localshred bit of cleanup in preparation for more "real" fixes. In particular, this makes sure the spec protos are always compiled, which is kinda important.
I actually quite like the "safe assignment" style, and it's encouraged by rubocop/styleguide