Tweaked array.{c,h} a bit