Switch back to G_InsideBase() & fix location checking.