unify inlining method in prep for inline tests
5 files changed