Resolve inconsistent trace logic in method tracing

[tannalynn]

In the method_without_push_scope and method_with_push_scope methods, we are doing things slightly differently in regards to the code_header option. We should be consistent and use the assemble_code_header method in both places.