Moving code around to prepare for more complete and correct binding of methods