Fix code relying on magic calls.