Changed macro name DISABLE_ASP_CHECKS -> DISABLE_CHECKS. Removed some old XXXs/TODOs.