tweaks to retain user tabstop when appropriate