Improvements to the on... condition handling mechanism.