Partial fix for #294: support statics