Vip restricted commands check fixes

Couple of simple fixes for VIPRestrictedCommands[Check|Test], required for the migration to PHP-Parser.
OK, we can tackle this later.