(maint) - Format changes. Remove import sentinel macro.