Again, merely a by-product of me wanting to change as little as possible. (shall I do a rewrite?)