IMO this method is useless now, it can be all inlined above.