Cursor and bracket-matcher tweaks