Make vspace and hspace collapsing optional using the additional collapse
class.