tweaks and tests to treat false as not nil