Towards 0.5

Non-tracked improvements for ownership-0.5