Small tweaks for 4.1

Last pull had an accidental assumption causing minor test failures pre-4.1 (whether or not binds should be cast before logging).

The intermittent failures turned out to be an ordering issue solvable by a test patch tweak.