Several fixes and cleanups on opline num support