Refactor syscall defs