GitHub #154, #155: Cleanups and test regression fix for builtin_osc