Restored "__pi_arg" to use UN instead of MN again (due to a test
failure).
Removed commented out code.