Fix #19 - it's ok to group related defs together