Collision System Aftermath

Small things that improve stability, or at least readability and
cleanliness such as setting some defaults to 0 and NULL.