[WIP] Code review fix.