Separate out singleton fact
Factor out as separate facts more