On second thought, better off with short arrays

Signed-off-by: Chris Sanders <zidane@outlook.com>