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.
Would rather just extract the variable set to a line above and check the `field` var in the `if`.