gcc-post refactoring