Doesn't look messy to me and what's clear to you may not be clear to a first time reader of the code.  Imo.

It's a bit unclear as to where you want me to remove the fall through comments apart from the above case.  Can you point the other cases out or what case you want me to remove explicity?