Further clean-up now that class == NULL has been eliminated.

Change-Id: I8be4bb4e46813ec04a0f8cd22d30f9e9b28895f0
2 files changed