Removed concept of weak canonicalisation and fixed some compiler warnings.