Eliminating some duplicated code that was moved to asf_meta

Also: MAC build fixes, Makefile fixes.