Improved searching through canonic forms.