Fix once and for all the constant issue with handling arrays....

Signed-off-by: Suki <suki@missallsunday.com>