Rewrite indexing of mutable HVec
Clean up