Add clipping to collision/overlap routines