Simplify --common implementation