Preserve explicit null defaults and… — Code review | OneNoughtOne