Invert Boolean Refactoring #874 (more work)