Remove some underscores from function definitions and add a missing 'break'.