Moving map code to using the target display methods.