Acinclude file optimizations, co-located items, add defaults, etc.