Re-wrap functions as functions. Fixes issue with RVM reload (cd wrapper will be overwritten without error)