Fix/#305 annot bootstrap

Fixed bootstrap problem with annotations. This was an instance of a more 
general problem that we allowed too easy access to uncompleted decls. 
Some cleanups in the general area were added. 

Closes #305. Review by @samuelgruetter