Force setting of new line number at start of each method.

ALso fixed soem indentation issues in generated code.