Source level 1.7, some tweaks.