Fix wrongly merged comments.
Delete unneeded typedef after merge.
Avoid unintended switch fall-through.

Added break statements to all cases, for consistency.