Remove the unit argument in mk_source and reorder arguments.
Remove the `mk_` prefix.