Updated return types fro self to static

[eldadfux]

For better auto-completion when we extend our base classes.