adjust compiler-macro expansion and lambda-list parsing