Improve performance by removing restfns.