Tidy up these `using` statements