Better whitespace trim & new e-p spaces-to-plusses flag