I agree. Let's see what @mlaflamm thinks, but I'll merge this PR in the mean time since it's not related.