@philix Just read through this commit, it's really nice!