I have also made some simplifications to some of the aspects.
I have combined TransactionAspect and SessionAspect into SessionAspect. The split here was very arbitrary and just confusing things.
I have also combined ConsumerAspect and ReceiverAspect into ConsumerAspect for the same reason.
