Speed improvements to make and unmake