cleanup achewood regex and arg-handling