Backport object-oriented CALL format to 1.5 (upon conversation with peterg).