This finishes changes started in the mem-optimize branch to remove the AtomProp class from the public interface.