Fix regression in builtin.go