In general I am not opposed, but I would much prefer to stay in sync with EAK on basic structural stuff. Perhaps we can push these changes upstream (from #138) so that we can still be in lock-step...