configure: cleanup switch statement