Further cleanup, of the apN stuff

Felipe Lessa suggested some minor changes.