Adjust method source when adding block
Add #body to CommandExpression, CallExpression for consistency