af-main & af-binder: Partial shift to token logic