Definitely a bike shed issue. Let's not worry about it. Poking through PR's the last few days has helped me crystallize some thoughts about a larger refactor effort in this area of code anyway.