Cleaned up directives to make syntax more uniform.