Removed unused argument from -aux function.
Fixed syntax error in lambda list and removed unused argument to -aux method.
Added FIXME comment.  Fix later.
Catch more special cases.
Bug fix and added missing writers.