A little more debugging.
Handle some conversion cases to minimize erroneous "diffs"