Rework output because indirect references couldn't work.