more tweaks to metaprogramming utilities