Moved arrays again to "static_scalar:" & little cleanup