Fix discrepancy in %instance-length for instances created by genesis.
Redo previous change a la suggestion of Alastair Bridgewater