Simplify more declarations.