Misc restructuring.