Basically undid all the extra vectorization.  I shoulda branched or something.