Clean up details accessors (revert to code in c91519d)