Use +defer:

+ fix other stylistic issues