Code cleanup; Stop typing JirmPrecondition