amdefine, finish adding Array shims