design/d1: Incorporate Darren's suggestions