Final fix for with statement.