Mostly cleanup and clarification

This also make the Ranges & Marks list much less angry.