diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 53da7ca36b..2e59c1fb0c 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -343,15 +343,6 @@ ASTSqlPlusCommand SqlPlusCommand() :
   { jjtThis.setImage(sb.toString()) ; return jjtThis ; }
 }
 
-/*
-SRT 2011-04-17 This syntax breaks the parser when fields of record.attach* are referenced  in PL/SQL
-void attachLibrary() :
-{}
-{
-	<".attach"> <IDENTIFIER> <IDENTIFIER> <END> <IDENTIFIER>
-}
-*/
-
 /**
  * All global definitions of triggers, functions and procedures are evaluated here.
  * Every occurrence goes under a new PACKAGE-Node in the XML document.
@@ -5122,22 +5113,17 @@ TOKEN :
 	//( <LETTER> ( "#" ) )
   |
   (
-    "&"
-    (
-      ( <LETTER> | "_" ) ( <LETTER> | <DIGIT> | "$" | "_" | "#" )+
-      (".")?  
-    )?
+    <LEXICAL_PARAMETER> ( <LETTER> | <DIGIT> | "$" | "_" | "#" )*
   )
 	|
 	( (<LETTER> | "$" ) ( <LETTER> | <DIGIT> | "$" | "_" | "#" )* )
 	|
-//SRT	( "\"" (<_CHARACTER_WO_ASTERISK>)* "\"" )
 	( "\""  <LETTER> ( <LETTER> | <DIGIT> | "$" | "_" | "#" )* "\"" )
 >
 |
 < LEXICAL_PARAMETER:
   (
-    "&"
+    ("&&" | "&")
     (
       ( <LETTER> | <DIGIT> | "$" | "_" | "#" )+
       (".")?  
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
index e32d89e7ce..865a91e4f3 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
@@ -167,7 +167,7 @@ public class PLSQLParserVisitorAdapter implements PLSQLParserVisitor {
     }
     
     @Override
-    public Object visit(ASTRead2NextTokenOccurrence  node, Object data) {
+    public Object visit(ASTRead2NextTokenOccurrence node, Object data) {
         return visit((PLSQLNode) node, data);
     }