Attempt to make a release build possible...
Move things with side effects out of assert()