Make adjustment to variable naming, fix comparison.
	-- remove unnecessary call to get_identifier_from_override() and pull directly from the dict when needed.
	-- make comment more specific.