Added more aggressive inline optimization