Tortoise: minor cleanup