Minor clean ups and renamed and moved Meth to MethDeclaration.