Develop: Harmonize ArrayDeclarationSniff to upstream changes

Merge #244 into `develop` branch.