Use dedicated indicator instead of nargout to only request decomposition; closes #1919 (cherry picked from commit 2ed41653)