Cleaning up the internal API to minimise the risk of difference between convenience methods.