Add boolean logic parser with unary operator, refactor a bit.