Minor restructuring of program locations.