null default for comments and move defs near locs