Code doc/cleanup/fixup (refs #3463)