Tests pass through 13; refactor last definition.