Code review cleanups

Changes based on our (partial) code review today.  We'll review these tomorrow & merge.