Avoided split_exclude() for Q when used as an expression. Backport of bc87061a3c7c8d6b4d2469f35cc78683c6cff647 from master