I agree, but let's do this in a separate PR! This one is big enough. :)