Avoid release mode warnings.

Variables only used in asserts have been removed, their content used
directly in the assert() instead.
Merge pull request #653 from atgeirr/fix-warnings

Avoid release mode warnings.
Merge remote-tracking branch 'origin/master' into xavier-master