trix_core: Cleanup the code for #4.