Moved nested types from Style and Line.