Tidying up gibbon code.