Tidied.
Adjust pointers past disabled layer.