combine prior and subtraction systematics into a single systematic each

[jdmulligan]

Did basic check that this works -- @ezradlesser let me know if any problems.

The code here is growing a bit messy -- we should clean it up after HP.