Minor restructuring of program locations.

No match.