More collision improvements and cleanup from ioq3.