Types cleanup

This cleans up the OF 1.0 API a fair amount.