Sorry about the unrelated changes. Sometimes I can't help myself.