Migrate to check_define