Re-arrange to not always alias