More refactoring to the internals of the layout inflater module.