CHOP-33. Review changes for Chopsticks prototype.

This commit makes several small changes throughout the code base that were
identified as part of a code review of the original Chopsticks prototype.