Address inconsistent type vs location_type usage

Opening for build, please ignore for now.
E501 line too long (131 > 115 characters)