Some cleanups on ext-inter config macros Also includes a change in the wedge primary functions providing a slight improvement. Change-Id: I536d3209f59624e23128708e29fa85c1e6fcd97e