f90charm: Clean up some code for easier diff management