Eliminate excess scoping which resulted from eliminating inline declarations.