Merge "Rewrite Class init entrypoint to take a Class arg."