Revert "generalize from tnone to fixed O"

This reverts commit 35c511e8a442cf1d6a3d74854992c650231ea037.
wip