Removed that awful vecref and the associated template weirdness.