Revert "Revert "Core code source usage of ::= and other cleanups.""