Fix rvalue-ref issue in ShenEOS