Fix: column location of key-spacing with additional tokens (fixes #1458)