Rewrite method definition bodies. Also renamed a method to distinguish between method declarations and definitions.

llvm-svn: 44080