Renamed/moved self memoizing functions