Handled a few long-standing FIXMEs.