Merge "Handle unbound arrays correctly"