Compensations refactor 2

Test with: https://github.com/jbosstm/jboss-as/pull/33