g/c null defs and some whitespace to boot