D'oh. Maybe it would help if I reviewed the entire commit before commenting as I see that you've done the re'organizing I mentioned.