More progress on angular conversion.