Move puzzle members up to generic puzzle class.