Address review in #58

Unified diffs keep confusing me. "Two" as in `_customValue` and `_customValueIndex`. ;-)