Fix error handling for #elif and #else.

elif or else after #else is an error.
We didn't detect taht error.
Cleanup.