Some of them are parameterized on the method but ended up differing between both so can be made non-parameterized.