Coding style corrections.
Use the convenience function for adding booleans instead of copying this 3-line dance everywhere.