Added lots of inline class and method references.