Pull latest class code.

Just resyncing with latest from class repo.