Fix strongarm variables: comments etc