Slight value class refactoring.