More auto* fixes and moved dolt macros to m4/dolt.m4