Fn handling refactorings.