Small refactoring of SetupWrapper

This moves some functions to the top-level and threads through the
required arguments. This helps to separate concerns a bit more, as
opposed to having all functions defined in one big blob.