ensuring that old-style :first, :last, :normal still work

Change-Id: Ic51556a98e874f7753c8e52e9eb191f8705795f6