1. I thought @weese had to review this, not @holtgrewe 
2. Does the problem occur only with Wotd indexCreate()?
3. Why don't you just move it in index_shims.h and remove the TODO?