f993344b19
By moving conditional code inside the functions, we can reduce duplication and in one case we can even eliminate one...