Cleaned up some merge conflicts on the PaulFiesel class, introduced by
my previous merge.