Fix startup matching of extra whitespace, add command to strip trailing dito.