mescc: Refactor decl.