Small changes following a code review with fresh eyes.