Remove unnecessary `begin`s from CLI code