Fixed comments, removed superstitious throw decls.