Let's be very picky with the spacers we extract

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>