Cleaned up material package import statement handling.