Small cleanup

Clean up a FIXME. Passes all tests.