Added canonicals again, the proper way; with variables.