I noticed that all the default values (e.g., `flux=1.`) have been removed; should we also remove the default values in the comments above as well?