Cleanup and updates, including more 1.5-ification.