Address inconsistent type vs location_type usage

Opening for build, please ignore for now.
E303 too many blank lines (2)