Post-processing idiom tweaks