Simplify rules for parsing arrays slightly