Fixes to allow tap to run under --use_strict