Fix bugs caused due to boolean variables, including when they are properties of structs.

Fix bugs caused due to boolean variables, including when they are properties of structs. #646