Minor clean-up (to compile ... *sigh*)