From cdd4d6aaa6c5c65a6460e288f44e2e18021a1c19 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 21 Feb 2018 15:42:45 +0000
Subject: [PATCH] Reduce some of the meta programming