@comex Thanks for the suggestions.
I'll give the inlining a try, well right after I figure out why I'm now getting the following error after updating my nightly:
Assertion failed: (ReqTy && "extractvalue indices invalid!"), function getExtractValue, file /Users/travis/build/rust-lang/rust/src/llvm/lib/IR/Constants.cpp, line 2096.