Cleaned up forwarding functions.