More collision handler changes.
Removed vim modelines.  Ran go fmt.
Undid unintended edit.