Clean up some references to layout & some duplicate data passing.