Apro_gen: refactoring. apropoints.