Update with Lifan's method of removing pointer functions.