Cleanup all code for consistency, and clarity.

I don't like the padding for concat. Please restore for all concats.