Fix more bugs with AFC/R; see #199

Geez @wikipedia-mabdul :p