A couple of optimizations and updates for 1-file-style.