Fix (and simplify) the blcr module.