Improve output of .roll and .calc commands