Changes the way calls and subs are resolved to meet changes in pre1 spec. Adds check for the cleared field when a sub is changed.