split up optional.go.patch