1. Switched return values; 0 now means no collision.  2. Added UID as mandatory second argument.