Restructured location-to-character control flow