Factor out more duplicate code.
1 file changed