Further refinements

Adding conditions means adding body literals.

Also rule out protection moves: