WIP on removing matchSpace dependency.

matchSpace no longer needs to do everything it used to, and there's
overlap with code that determines the leading space.