Fixing some type assertions

that weren't getting caught because my env was hosed upon switching to
go1.3 whoooops