Remove the inlined implementation of Fix, and use Fix proper.