Tidy up Fury and Conv fit

Refs #10626