Minor clean up after #1102