Added the capability to remove empty optional attribute values
automatically.