Added better constant support (array of constants).