more rewriting

some more rewriting of the assessor-calling mechanism.

I started because the forumualtion of Y was odd (...given that) and then got carried away...