0.31: Tweaked expression terminators and revised attribute parsing.