Minor preparations for the next version of larvittmpl