More cleanup. Fixed Action-based OAuth scope detection.