Cleaned up the collector policy and added more asserts to enforce that the heap is correctly setup. Reviewed-by: jwilhelm, jmasa