WIP: cleaning up widenIfNecessary