Exclude Datanucleus for assembly only.

Also some cleanup.