Minor bytecode cleanups