I tried to improve !3 (closed). I let the grep as it is. I'm not sure if -E is more readable. @intrigeri can you look over this, so we can bring this into master?