Wrap stuff in 'using' blocks since I missed this originally