Remove inlines to make release compile.

OTS by Tryneus.
Merge branch 'next' into sam_939_alt