Cleaned up directive dependencies a bit.