Further optimisation of --nogit