Rework space handling with OPTIONS pragmas. Fixes #172.