Issue 59

Update the whitespace token preserver to include calc for issue #59