Slight improvement to our CLI code.