Basic Faceplus integration, cleanup for handling the various face trackers.

Closes #2618.