Build on go1.2.1 as well.
A bit of simplification for Makefile.