Marginally better handling of descriptions.