Extend make_fint to use format strings instead of fixed prefix.

* This way arguments can be formatted more flexibly and some unneeded
  white-space can be omitted.
* This also fixes some trailing whitespace issues.