fix model build re: namespace decl with no bodies
handle self:: and ambiguity of class defs across modules in some cases