Can you add an inline comment stating which is which in the code?  Then I think this is good to merge.   @rozza Thoughts?