Update CLI surrounding to be more user-friendly.