Working through Timo's suggestions slowly but surely...