TSAGE: R2R - Get rid of some magic values, fix an unnoticed bug