Update this to use the new with statement.