Finalizes syntax fixes started by @conatus.