Convert to tabs; simplify contentScript wrapper API