Clean up class scoping.