Folded in scopatz's syntax edits, minor refinements