Fix minor coding guidelines introduced with CLI permissions.