Small refactoring of amendment processing