Use aes_q in borders to eliminate check warning
Avoid special evaluation in collide
Avoid more non-standard evaluation