OR: Try to clean up some URL generation.