MADS: Janitorial - Trim more trailing whitespace