Cleaned up inter-directive messaging. Renamed directive to OptKind.