Stainless MDL:  Code tweaks for consistency