Minor clean up, see #2388