Added canonicalize-kernel-form-identifier[s]