Merge some fixes back from the fare-3.1 branch:

* override for prepare-op is on component-depends-on, not perform.
* coerce-class must be defined after call-function, and accept *package* for now.