Convert estimators and decorations to shorthand
Temporary commit while rewriting assumptions and theory