De-inlined more stuff in hopes of finding bus error