Code review notes marked with #? -- meta, the methods don't much have a
feel of comments being coded to make them true, meaning there didn't
appear to be a comment outline with code to fill it in.