Thanks, Nicolas! I've pushed this to master.