Replace magic number with OS_LAST+1
Make array init more obvious