Ben: support an optional space for the picky folks