Made all internal calls use the internally-defined API, rather than the (convenient) aliases.