Address Ben's easy comments on second patch