Handle multiline types better