remove various superfluous 'default is' statements