Partial fix for method not found errors.

Still need to do the late-bound case.