Additional removal of trailing spaces.