Fixed up layout inheritance.