Merge branches 'unreplaced' and 'inline'

* fix "unreplaced" warnings caused by using typeof() on inline functions
* cleanup related to inlining of variadic functions