Clean up cli directives a bit