Normalizing the inlining, geting rid of extra 'src' nesting.