Tweaks including subscripting ops, and adding HOL ref.