Replaced bare meta-calls with call_dcg//1 and fixed macros
Small simplification to goal expansion.