Have the functional sugar match the R names, signatures (#179)