This is irrelevant to the actual necessary changes, but it's a definite improvement—nice one.