Foundation cleanup (#479).