Further work getting good vectorization