fixing some bits and bobs aftr that daft overengineered refactor d2c4d33 Diomedes Git commited on 9 days ago