Refactor some active record sillyness.