[WIP] Use bool as return type on functions that return a bool

@splinterofchaos is completely right, :+1: for just removing that branch. (on a separate note, that function could use some simplifying). Ping @philix as well.