Patch Set IV - Handle constant arrays as well