Yet more work on implementing push-down rules