removed some inlining so this legacy branch can at least compile with optimizations turned on.. eventually.