Minor refactoring of static objects buffer management