Make the less magic more obvious for future folk