Minor changes. Also works with Go 1.2.