Somewhat more progress on spaces & parens