Tidy up inspirecd by bolt#1723 breaking things

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>