Fix canonical helper.