Even more conversions to formal register