Some clean up of the collisions interface to make it more me friendly.