More cleanups to make ABS validation not make mistakes.