Changed return types for procs, making things easier.