fix semantics

leading spaces are stripped anyways, so start with the nonspace stuff