Fixes bug with oneline clause (space? was missing)
Makes captures a simple element of an expression

Also fixes a few specs where needed. Two specs still fail, but that
seems to be the fault of the spec.