A lot of useful changes to handle implicit shapes, and clean some things.

Implicit vs implicit collision detection has not been tested yet.