Minor code changes that should not change visible behavior

Mainly done to make the code for getting file, line, and column of
warnings usually, if not always, first define a map value 'loc' from
which to extract :file, :line, and :column key values for the warning.