Cleaning up variable allocations and a few stray conditions in light of async