Change include= behavior to affect only hi=.
Fix tests relying on old key= behaviour.