Some more clean-up and doc comments for the ORM module.