Cleaned up os::consts