Inlined some things