[Q21.5?] Change ABORTs in the X code to assertions.