Add -spaceless variant to Container