Get to 100% branch coverage

Exercise edge cases in branch statements.