Rejig for Abstract State Descriptor

Performance has become really sucky.