Refectoring some code for BLUR-400, now resolved.