Code cleanup
Ensure that the iterate options that should be booleans always are