Address inconsistent type vs location_type usage

Opening for build, please ignore for now.
W293 blank line contains whitespace