Block -> Sign where it matters. Intermediate step before full refactor.