+ Replaced this with self in new pass functions for C++ compilation