[fix] More makros and fewer validation errors.