Catch a few more special P5 variable names