Minor fiddling with code.