Fixes from pull request #1643

Fixes from pull request #1643, now includes array method correction per akre54 feedback on pull request #1709