I think I got it this time.
The indentation is still not working right.\
(Again, below screenshots show the indentation how it used to be; the light grey boxes show where the indentation moved back to after applying that last patch.)
Indentation lost in forms like eval-when-compile and when
This is the worst.
I see this same issue on emacs -Q with your final patch applied too:
This indentation issue is very difficult to miss.