More work on the "using" sections.