Improved access level tracking as per #3, but more improvements are
necessary still.