Some suggestions from @decause.