Minor cleanup. Mostly removing now-unnecessary method declarations in class extensions.