Fix boolean parsing from manee's commit (77556c4e7a4463009e70105e9a680d122aad41d4), some minor cleanup