I guess it depends a lot on what you consider fragile or clumsy.
Well, to make it a bit more concrete, at least 3 people originally missed this issue in commit bb2fa97c33fd1591097741b809854763c0623697, and it took me a bit more time than I would've liked to review this MR. Arguably a good chunk of that is down to my shortcomings as a reviewer, but perhaps we could try to cater to those?