Fix for scanner bug (introduced with most recent change). Fixes #433. R=rsc CC=golang-dev https://golang.org/cl/179072