Allow integer-based reference values, including zero. Added regression tests for both cases.