More libsub tweaks.