Minor clean up from str4d's code review on #1010