Clean up interface definitions throughout.