First stage of fixing this.-invocations