Removed declarations in constructor that would return null on enable.