Let's just make these std::function's into typedefs, makes it easier for the future

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>