Cleaned up the normalization and compliment logic in the rangestore.