[r_value] Minor beautification