Minor cleanup (c99) and consistency enforcements to collision model and server entity management.