A bit more width related edits.