Record: refactor macros to make them more user-friendly