Adopt Marius' line-edit suggestions