Only test on Go 1.3.3.
Simplified the API a bit.

Also simplified the guts.