Some cleaning up.
Making token re-alignment ignore empty string tokens.