Fixed an issue with decl normalization.