Fix internal whitespace tracking. Fix #2