Fix widening of default options types when variables contain constant types

Fix widening of default options types when variables contain constant types #8284