Simplified expressions used in table printing.  Fixes #226