Is there anything more to do here Brett Meyer / Tim Ward? Should I take a stab at my suggestion on the PR, or will one of you have a chance to get to that today (to get it in 5.2)?