Remove unused define
Use _Bool
Merge branch 'call-me'