improved support for strange uses of 'common' keyword