Simple entity physics refactoring.