Bug fixes (ordering of decls).