Rework build_subs(), thanks to Michal Schwern, closes: CPAN#22073