Re-factor mkAtomicArgs and completeNonRecX