Partial introduction of bools where appropriate.
18 files changed