Improve organization of code to format warnings differently for redaction / error objects / etc

[nbrooke]

Right now there are a couple problems with the way that the code is structured to pick how to format the output with required redaction / related objects / error objects / etc. There's a bunch of things that are early outs but that are if's rather than guards (which might be a little better), a bunch of very similar code between multiple forms of the logging functions (warn vs error).

It would be nice to clean that up, factor out some of the common code for generating the additional info strings into a helper function, make the picking of what to do either more consistently an if else tree OR more consistently guards rather than the current mix, etc.