Fix #404

Some new code was assuming the box required is always non-empty. Not so.
Fix for trunk llvm.
Merge branch 'master' into no_runtime_includes