After thinking about it more, I'm fine with leaving this as-is. The only other options are uglier.