Space tokens a bit less, less bloat