Lovely 0.9.0 added support for recursive patch loading. We should refactor our patch files to make use of this