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.
The only thing that affects this seems to be `map_extensions`, which is called before it in either case. But yeah, you should look for yourself