Better looking output and fixes to CJS.

The CJS implementation never accounted for return statements as it
should.  The output was also not particularly good (one true brace
style), so I've updated it to match a nicer JS style.