Good idea. I'll do it in the cleanup PR to simplify things.