Further efficiency refinement to the declarations.