Small cleanup in meta builders