Fix up some small things

We do return from each conditional block, so let's drop the `else if` and `else`.