#12 - Finished off asInstanceOf removal