@jaberg's snippet was indeed shape-satisfying, so I made the change.