Harmonize ArrayDeclarationSniff to upstream changes

Related to #237, least controversial change