Remove horrible STATIC_MUST_CHECK hack, use better syntax instead