First attempt to implement the increments

Implementation strategy is based on postponed attempts to recognize the
punctuator type.
Needs future investigation.