Fixes after running splint, including a missing break; (should not have affected the result).