Add more machinery for shortcircuiting the touched calculation

This is getting really tiresome.