I fixed all the problems you found, re-run via indent-code.el and pushed to master.

Thanks for review!

S_W