Remove a lot of indirections; bug still reproducible