I've committed it. Please draw my attention to any follow-on fixes you find necessary (or even just desirable), so I can be on the lookout not to repeat mistakes with other machines. Thanks, Roland