Changes to constant handling required for servo

All comments from previous pull requests addressed.