Adjust range warnings so I can show vass my idea in code

This is a variation of a commit vass has coming.