Get rid of inline functions and explicit this capture