Fix the hastily synchronized code

Around the code, while on stream, we've put in some hastily-made hacks in order to "get things working". We should clean those up instead of just synchronizing the async code we called.