Fix error upgrading files with no deps or 'wrong' number of params if 'comma' formatting option is used

Hi, 

Just a small patch that adds an early out in the header generation during upgrade. This fixes a bug that was specified to the 'comma' formatting style.

Also just added another commit that fixes another issue if the wrong number of params are present in the require callback for the comma formatting option too. It also adds in an extra new line between the named require statements and the unnamed ones for readability.

Thanks
Dave