Removed unnecessary test.
Handle :NAME initarg in :AROUND method.  Removed unused parameters.