Fixed the BaseAtomFilterFunction (now registers its variables in a similar way to the BaseTripleFilterFunction).