Oh, and I was going to say -- I think all you need to do to fix this is turn `} else {` into a fallthrough: `} ...`.