Slightly saner handling of thumb branches.