Refactor more in block-osc.c.