Continuing code clean-up for the entity component system refactor.