Changes I meant to include in #451.
Merge pull request #454 from vasslitvinov/followup_to_#451_array-const-checking

Changes I meant to include in #451.

These are comments I added, as requested by Tom's review, and then forgot to commit.