Minor rewrite of space separation support