More fixing.
fixup! SpinBox: Cleanup.