Various code assist enhancements