No bug: fix servo toplevel classes; a=bustage