A great simplification proposal for cs2a

These are all great suggestions from @dwaite, it significantly reduces the complexity of 2a while improving it's security as well.