Fixes and additions to get m4-based code working.