don't calc diff term if it is not used for epsilon criterion

incorrect types for template instantiation

(cherry picked from commit aa96d8d0)

Typo breaks debug build for Android platform.

This should fix that pesky test failure that pops up from time to time.

I don't actually know if the default values should be zeros, but the tests
pass, so...