Changed signature of layout1ToRenderable and layout1DddToRenderable. All tests seem to expect this interface.