More thorough sanity checking

- ArrayMap provides sanity checking as well now