For new code let's go ahead and use 4-space Allman.  I need to document that somewhere.