Clean up how intent_expr is parsed

There was a small bug in how intent_expr was parsed. While there I cleaned up the rest of it based off some feedback from Brad.

Updates one more test that slipped through with the old task intent syntax.