Bring changes in simple.go up to spec.