Improve code bundler support with stub binaries