Minor cleanup based on tern warnings