I know you didn't add that in this PR, but it's icky. I'd be ok fixing this in a separate PR. I can do that later if you want.