Data-1199 and other code maintenance.