Tiny vimprovements!