first pass at ensuring warnings properly point to the calling code; will need to write a unit test for this as well