The problem of 1 not being prime could be easily solved by having a separate term, say "noncomposite" or whatever you like, that means the set of the primes and one.