Couple minor tweaks to latest edits.