Some of Marc Lehmann’s suggestions.