Strip trailing spaces
Various fixes for HoTT